Adwaita: Hack around list button styling

Once again.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 893ec95e04278aec5d251cbf5e06f5477f798038..ad400fbe1a82be41a61b72630dbe1a53b8ff25c3 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1170,8 +1170,9 @@ spinbutton {
       @extend %spinbutton_horz_entry;
     }
 
-    > button.image-button.up,
-    > button.image-button.down {
+    /* :not here just to bump specificity above that of the list button styling */
+    > button.image-button.up:not(.flat),
+    > button.image-button.down:not(.flat) {
       min-height: 16px;
       margin: 0;
       padding-bottom: 0;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d8e86ce95581c1533330bb248698438c72ef0390..0f166c7dbfd80fd088924ac89374384180f8774a 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -514,31 +514,31 @@ button:link:hover, button:link:active, button:link:checked, button:visited:hover
 button:link > label, button:visited > label { text-decoration-line: underline; }
 
 /***************** GtkSpinButton * */
-spinbutton:not(.vertical) { padding: 0; }
+spinbutton:not(.vertical) { padding: 0; /* :not here just to bump specificity above that of the list button styling */ }
 
 spinbutton:not(.vertical) text, .osd spinbutton:not(.vertical) text { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; padding: 6px; }
 
 spinbutton:not(.vertical) text:backdrop:disabled { background-color: transparent; }
 
-spinbutton:not(.vertical) > button.image-button.up, spinbutton:not(.vertical) > button.image-button.down { min-height: 16px; margin: 0; padding-bottom: 0; padding-top: 0; color: #dbdbd9; background-image: none; border-style: none none none solid; border-color: rgba(27, 27, 27, 0.3); border-radius: 0; box-shadow: none; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat), spinbutton:not(.vertical) > button.image-button.down:not(.flat) { min-height: 16px; margin: 0; padding-bottom: 0; padding-top: 0; color: #dbdbd9; background-image: none; border-style: none none none solid; border-color: rgba(27, 27, 27, 0.3); border-radius: 0; box-shadow: none; }
 
-spinbutton:not(.vertical) > button.image-button.up:dir(rtl), spinbutton:not(.vertical) > button.image-button.down:dir(rtl) { border-style: none solid none none; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):dir(rtl), spinbutton:not(.vertical) > button.image-button.down:not(.flat):dir(rtl) { border-style: none solid none none; }
 
-spinbutton:not(.vertical) > button.image-button.up:hover, spinbutton:not(.vertical) > button.image-button.down:hover { color: #eeeeec; background-color: rgba(238, 238, 236, 0.05); }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):hover, spinbutton:not(.vertical) > button.image-button.down:not(.flat):hover { color: #eeeeec; background-color: rgba(238, 238, 236, 0.05); }
 
-spinbutton:not(.vertical) > button.image-button.up:disabled, spinbutton:not(.vertical) > button.image-button.down:disabled { color: rgba(145, 145, 144, 0.3); background-color: transparent; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):disabled, spinbutton:not(.vertical) > button.image-button.down:not(.flat):disabled { color: rgba(145, 145, 144, 0.3); background-color: transparent; }
 
-spinbutton:not(.vertical) > button.image-button.up:active, spinbutton:not(.vertical) > button.image-button.down:active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):active, spinbutton:not(.vertical) > button.image-button.down:not(.flat):active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
 
-spinbutton:not(.vertical) > button.image-button.up:backdrop, spinbutton:not(.vertical) > button.image-button.down:backdrop { color: #878786; background-color: transparent; border-color: rgba(32, 32, 32, 0.3); transition: 200ms ease-out; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):backdrop, spinbutton:not(.vertical) > button.image-button.down:not(.flat):backdrop { color: #878786; background-color: transparent; border-color: rgba(32, 32, 32, 0.3); transition: 200ms ease-out; }
 
-spinbutton:not(.vertical) > button.image-button.up:backdrop:disabled, spinbutton:not(.vertical) > button.image-button.down:backdrop:disabled { color: rgba(91, 91, 91, 0.3); background-color: transparent; border-style: none none none solid; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):backdrop:disabled, spinbutton:not(.vertical) > button.image-button.down:not(.flat):backdrop:disabled { color: rgba(91, 91, 91, 0.3); background-color: transparent; border-style: none none none solid; }
 
-spinbutton:not(.vertical) > button.image-button.up:backdrop:disabled:dir(rtl), spinbutton:not(.vertical) > button.image-button.down:backdrop:disabled:dir(rtl) { border-style: none solid none none; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):backdrop:disabled:dir(rtl), spinbutton:not(.vertical) > button.image-button.down:not(.flat):backdrop:disabled:dir(rtl) { border-style: none solid none none; }
 
-spinbutton:not(.vertical) > button.image-button.up:dir(ltr):last-child, spinbutton:not(.vertical) > button.image-button.down:dir(ltr):last-child { border-radius: 0 5px 5px 0; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):dir(ltr):last-child, spinbutton:not(.vertical) > button.image-button.down:not(.flat):dir(ltr):last-child { border-radius: 0 5px 5px 0; }
 
-spinbutton:not(.vertical) > button.image-button.up:dir(rtl):first-child, spinbutton:not(.vertical) > button.image-button.down:dir(rtl):first-child { border-radius: 5px 0 0 5px; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):dir(rtl):first-child, spinbutton:not(.vertical) > button.image-button.down:not(.flat):dir(rtl):first-child { border-radius: 5px 0 0 5px; }
 
 .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #eeeeec; border-style: none none none solid; border-color: rgba(0, 0, 0, 0.4); border-radius: 0; box-shadow: none; -gtk-icon-shadow: 0 1px black; }
 

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c95fc327572bd8ddd9b654e8bb548acd3c94dbfa..c2c2bf945ad407e2fc5fe64d699c80599bf06753 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -522,31 +522,31 @@ button:link:hover, button:link:active, button:link:checked, button:visited:hover
 button:link > label, button:visited > label { text-decoration-line: underline; }
 
 /***************** GtkSpinButton * */
-spinbutton:not(.vertical) { padding: 0; }
+spinbutton:not(.vertical) { padding: 0; /* :not here just to bump specificity above that of the list button styling */ }
 
 spinbutton:not(.vertical) text, .osd spinbutton:not(.vertical) text { min-width: 28px; margin: 0; background: none; background-color: transparent; border: none; border-radius: 0; box-shadow: none; padding: 6px; }
 
 spinbutton:not(.vertical) text:backdrop:disabled { background-color: transparent; }
 
-spinbutton:not(.vertical) > button.image-button.up, spinbutton:not(.vertical) > button.image-button.down { min-height: 16px; margin: 0; padding-bottom: 0; padding-top: 0; color: #43484a; background-image: none; border-style: none none none solid; border-color: rgba(205, 199, 194, 0.3); border-radius: 0; box-shadow: none; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat), spinbutton:not(.vertical) > button.image-button.down:not(.flat) { min-height: 16px; margin: 0; padding-bottom: 0; padding-top: 0; color: #43484a; background-image: none; border-style: none none none solid; border-color: rgba(205, 199, 194, 0.3); border-radius: 0; box-shadow: none; }
 
-spinbutton:not(.vertical) > button.image-button.up:dir(rtl), spinbutton:not(.vertical) > button.image-button.down:dir(rtl) { border-style: none solid none none; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):dir(rtl), spinbutton:not(.vertical) > button.image-button.down:not(.flat):dir(rtl) { border-style: none solid none none; }
 
-spinbutton:not(.vertical) > button.image-button.up:hover, spinbutton:not(.vertical) > button.image-button.down:hover { color: #2e3436; background-color: rgba(46, 52, 54, 0.05); }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):hover, spinbutton:not(.vertical) > button.image-button.down:not(.flat):hover { color: #2e3436; background-color: rgba(46, 52, 54, 0.05); }
 
-spinbutton:not(.vertical) > button.image-button.up:disabled, spinbutton:not(.vertical) > button.image-button.down:disabled { color: rgba(146, 149, 149, 0.3); background-color: transparent; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):disabled, spinbutton:not(.vertical) > button.image-button.down:not(.flat):disabled { color: rgba(146, 149, 149, 0.3); background-color: transparent; }
 
-spinbutton:not(.vertical) > button.image-button.up:active, spinbutton:not(.vertical) > button.image-button.down:active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):active, spinbutton:not(.vertical) > button.image-button.down:not(.flat):active { background-color: rgba(0, 0, 0, 0.1); box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2); }
 
-spinbutton:not(.vertical) > button.image-button.up:backdrop, spinbutton:not(.vertical) > button.image-button.down:backdrop { color: #9d9f9f; background-color: transparent; border-color: rgba(213, 208, 204, 0.3); transition: 200ms ease-out; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):backdrop, spinbutton:not(.vertical) > button.image-button.down:not(.flat):backdrop { color: #9d9f9f; background-color: transparent; border-color: rgba(213, 208, 204, 0.3); transition: 200ms ease-out; }
 
-spinbutton:not(.vertical) > button.image-button.up:backdrop:disabled, spinbutton:not(.vertical) > button.image-button.down:backdrop:disabled { color: rgba(212, 207, 202, 0.3); background-color: transparent; border-style: none none none solid; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):backdrop:disabled, spinbutton:not(.vertical) > button.image-button.down:not(.flat):backdrop:disabled { color: rgba(212, 207, 202, 0.3); background-color: transparent; border-style: none none none solid; }
 
-spinbutton:not(.vertical) > button.image-button.up:backdrop:disabled:dir(rtl), spinbutton:not(.vertical) > button.image-button.down:backdrop:disabled:dir(rtl) { border-style: none solid none none; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):backdrop:disabled:dir(rtl), spinbutton:not(.vertical) > button.image-button.down:not(.flat):backdrop:disabled:dir(rtl) { border-style: none solid none none; }
 
-spinbutton:not(.vertical) > button.image-button.up:dir(ltr):last-child, spinbutton:not(.vertical) > button.image-button.down:dir(ltr):last-child { border-radius: 0 5px 5px 0; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):dir(ltr):last-child, spinbutton:not(.vertical) > button.image-button.down:not(.flat):dir(ltr):last-child { border-radius: 0 5px 5px 0; }
 
-spinbutton:not(.vertical) > button.image-button.up:dir(rtl):first-child, spinbutton:not(.vertical) > button.image-button.down:dir(rtl):first-child { border-radius: 5px 0 0 5px; }
+spinbutton:not(.vertical) > button.image-button.up:not(.flat):dir(rtl):first-child, spinbutton:not(.vertical) > button.image-button.down:not(.flat):dir(rtl):first-child { border-radius: 5px 0 0 5px; }
 
 .osd spinbutton:not(.vertical) button { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #eeeeec; border-style: none none none solid; border-color: rgba(0, 0, 0, 0.4); border-radius: 0; box-shadow: none; -gtk-icon-shadow: 0 1px black; }